Delete useless option and logic