more governor clean up
all those govs were redundant