Removed
moved
Updated shims in new location
Removed
Updated and new unit test
Cleanup dependencies