removed TODOs and some scaffolding