Remove path resolvers.
Improve template resolvers.