Partial cleanup - still have 3 erors