updates to work with latest upstream

why are you removing all of these?