Added proper calendar units and identifiers as per iOS 8 deprecations.
Removed unused variable.
Removed unnecessary deprecation change.