Remove return SUCCESS (which is for debug)