Forgot to include these cleanups.