removed ifs that were rendered obsolete by before_action