much code cleanup, such wow.