remove unused code and tests already covered by Aryeh's tests