cleanup, to get something comparable to master