LPS-45810 Remove specific code which is no longer needed