code cleanup and simplification

git-svn-id: svn://svn.code.sf.net/p/htmlunit/code/trunk@9493 5f5364db-9458-4db8-a492-e30667be6df6
ups

git-svn-id: svn://svn.code.sf.net/p/htmlunit/code/trunk@9494 5f5364db-9458-4db8-a492-e30667be6df6
more cleanup detected by findbugs

git-svn-id: svn://svn.code.sf.net/p/htmlunit/code/trunk@9495 5f5364db-9458-4db8-a492-e30667be6df6