MAINT: dropping some unused bits