Remove conditionals by using single ensure param

Also bypassed  class