More cleanup
Shuffle resolvers