Fixed MYGUIDE-578
Removed obsolete TODOs.
Merge pull request #110 from robin92/accessfix

Fixing MYGUIDE-578