Compatibility with go1.1
Cleanup