Removed some tasks from TODO