Still more cleanup of boltztrap.