Cleanup and removing defined resolver classes