update deprecated/removed pieces to build with Nightly