SCATTER-94
Removed uneccessary code
SCATTER-201
Removed unnecessary code