another cleanup + marked TODOs with a warning