Various housekeeping and drop unused whitebox packages