Remove debug code from build
Add clean step to build