PORTAL-721
- remove duplicated class