remove some method resolve workarounds