Nicola: add additional cleanup commands