Remove the ifs