Remove un-used code & dependencies
Release 2.2.0