remove unnecessary conditionals