Removed iPad version. Switched #import to @import. Removed a couple of warnings that were no longer necessary.

Yes, I know the project should automatically use the new import
features, but I'm switching to the new @import now.