Remove missing option
Introducing some optimizations