cleanup of auto commands among others