Small updates for Xcode 6

Just cleaned up a few things – extra imports, an explicit cast, removing old files (see commit messages for more detail)