Remove validate calls to improve performance