Code Cleanup - removed deprecations and removed empty task description