Apply Eugene Burmako's patch to fix divergent implicit issue
Cleanup, remove unneeded methods