Remove files and get build working