Fixed #586 again: removed new methods and renamed existing Obj-C methods