Even more garbage clean up.