some cleanup
STUD-154