Remove and fix build issues