===> Cleaning for go-1.3