code cleanup - error still persists