Update for cleanups in hwc interface