WSOTWO-112: Removed unnecessary java classes and code