Some major cleanup.