More cleaning up - things still working