Cleaning and TODOs