Nightmare governor: Removed unused code, adjusted some piece of code....