removed unused models and cleaned remaining models. all tests pass