Remove more stuff only needed for the obsolete command syntax