Trying more sneaky cleanup