{Data-1649] [Ultimate Equipment] Adaptive fix cleanup

This just cleans up the previous fix