Task functionality cleanup
Task stuff