remove unused function added by merge