Remove dead stuff from test models