Removed more unused methods.
Updated to modern Objective-C
Code clean up