Fixing MYGUIDE-578

Additionally removed old (already invalid) TODOs.