Removing stupid code
Merge branch 'compile' into develop

Removed stupid code