clean up default options code