TODOs clean-up