remove some method resolve workarounds

The bug still exists but the conflicting methods have been removed.