Remove obsolete code
Delete legacy package
Rename strategies
Merge pull request #1 from dfyx/cleanup

Cleanup