Some cleanup, and committing output files