More cleanup.
Even more cleanup