Removed zero cleaning
Updated TODO file