[GEOT-4640]cleanup