Removed unneeded code, updated models, and tests to reflect new domain models.