1. AMD fix
2. cleanup
isNeedResolving public method