clean up from Task refactor