[cleanup] remove some cruft