[HELIX-238] Cleaned up ResourceAssignment