WIP ISPN-3917
WIP Remove unused class
wip