PCT-637: cleanup