Cleaning problematic stuff