Remove erroneous lines

Recompile
Merge branch 'develop'