Delete useless option and logic
Delete useless option and logic