Cleanup manager, remove commented out code in thread