More cleanup.

Thanks @joannou