remove unneeded code after merge