Fixing unused variables [ci skip]
Random updates to version 2.0