Tiny fixes of useless declarations + optim.
Merge pull request #1388 from emanwebdev/patch-33

Tiny fixes of useless declarations + optim.