Continoue cleanup 1