Remove automatic validation