cleanup, prepare to merge