I'm back with a lot more cleanup