Removed resolve path from a load of the methods that don't really need it