some cleanup
STUD-1133