[BISEVER-9712] -- code cleanup