governors cleanup

Change-Id: I800a59d13c96d331f82a1864221cab57fbad2a63