Lot more cleanup