cleanup
Provider properties virtual for extensibility