LPS-35785 - Cleanup