Started major cleanup.