More clean and build