Removed a couple of unused model classes (now using common classes instead).