Keeping only generic commands