Cleanup on aisle 1

Continued messiness