Refactored unnecessary inclusions and cleaned up relations