Simple cleanups.