cleanup - still throwing errors