LPS-43589 Removes unnecessary code