Removed more gopkg.in stuff