Major cleanup

Sure?