unused code cleanup, added TODOs