Make sure Samba cleanup is done in simple mode [tracker #2010]