TRUNK-3289 remove unneccessary code