More cleanup; need to fix configurations for Xcode.