More cleanup; seems to actually build again