Refactor Relationship Auto Indexes
Removing unneeded class