Added pre clean for old schemas