cleanup, and prepared to submit to package control