Removing unnecessary code after merge