cleanups to minimise merging hassle