remove some cruft from testing