Revert "Remainder of Badass"

This reverts commit 41135c8a25d8e2675dec09cec4150c96a61db674.
Fix badass govervor
Bump to v3.1.0