Cleaned up old Alloy models