lots of clean up
clean up for Xcode 6 beta 5