More general cleanup of models