removing unused imports and code that is commented out; looks like was add by accident
Making those classes final that only have one private ctor, which means you can not inherit from them anyways