removed some unnecessary TODOs:moon: