Move TODOs to appropriate places