CE-568 Removing error suppression operators and unnecessary version check