Replaced @todo with logging call
Merge pull request #585 from matthiasbeyer/fix-object_todos

Remove `@todos` in object code