Remove stage directory contents before build
Add and fix comments