some cleanup, EDUID-164