Fixing unused variables/adding more optimizers [ci skip]