Suspend Governor: Code cleanup