Xcode 6.1 upgrade
Removed unused code (fixes issue #11)