Clean up Resolvers