Removed TODOs

Cleaned code