LPS-46311 Removes unnecessary code