Removing extra code
Merge pull request #264 from akvo/feature/260_hot_fixes

Removing extra code