More cleanup....

What it says!