More cleaning

More cleaning