code cleanup, removing commented-out code left in only to remind myself of what life was like in iOS 7