Remove extra functions that creeped in from merge