Cleanup
build enabled