Cleaned up task tags and lots of dead code