Cleaning and additional checks