Removed some TODO items that I've completed