Options page cleanup