LPS-45248 Remove, no longer going with this approach