SCATTER-201
Removed redundant code