Removal of todo comments