Removed cruft from some previous merge