cleanup before rebase
adding proper name fields back in