Updated build to clean first