Remove more DS and Version checks