Cleaned up the legacy models a bit and removed any performance hit that might come from GetHashCode.