8.34P cleanup