fix compile errors and remove 1 gov