Removed console logs and irrelevant TODOs