Merge "Remove old TaskManager system"