loadsa cleanups etc