Removing oldstyle singleton-model files