cleanup of commands plus examples