More cleaning and adapting