LPS-40334 Bug fix for staging expando and some cleanup

Will send the plugins after this.