Fix merge error and clean up unneeded entries