Removed unused paths, Fix model cacheing