cleaning up deprecated models