Much needed cleanup.