cleanup, get ready to push