Remove resolve* methods usage.
Remove resolve methods.