Removed unused code and added a new todo advice