remove commented out code
update tasks
fix missing early return