Removed comments and todo
Merge pull request #811 from Junkern/develop

Removed comments and todo