more cleanups
remove options