Code cleaning and added TODOs
Removed