Removed all code issues porting from iOS 2 to iOS 7