remove error logic