[THEME REVIEW] Cleanups.