fix option
remove unused code