start to clean for the last changes