Removing useless class and updating strategy interface to work with new
world