removed strategy-related stuff because it is now located in strategies
package