Entity wire cleanups.