Even more major cleanup