Fix #862 by implementing -c / --clean