Changed cli version
Removed Overrides
Changed war version
Removed overrides