Removed TODO comments  from main php file