Nightmare governor: removed some options and optimized code!