rm unneeded IF check