Fixed some stuff to successfully build it on Xcode 6.1

Had to remove some stuff. The updated Xcode couldn't compile the original files because the support of Swift has changed a bit.