Code cleanups.