removed old and unused code, added TODOs