Cleaned some done tasks from TODO.