Last cleanup of golang support