Remove description swizzling and avoid category method name clashes