More cleaning, code shrinking!