remove more 48/96-isms