cleanups and upversion