LPS-15921 Remove unused legacy code