Cleanup and fix content deploying to BIN