Fixed #61
remove strategy stuff