more cleanups etc