Removed todo comments