Total cleaning, minor errors left