removed code added by mistake in merge