cleanup & removed TODOs