remove some stuff and make build more vanilla for device specific changes