Cleaning up Advanced Options.