Cleaned up task definitions