Initial commit from Xcode.
Fixed

Just some code and file cleanup.