Clean up. Removed some unneeded tasks.