Remove concept of strategies.. for now