Still more cleaning, should be fine now