remove any direct references to model