removed cruft from borked merge