remove state classes from options
remove function names