Removed unused rules from grammar file, improved VariableDeclarationTest
some pmd cleanups