More cleanup...

More fidgeting