Minor housekeeping
Cleanup