Some extra cleaning up