refactorings to cleanup code
static finals are not allowed to be transient ... sure, was from refactoring
more tests
removed unused methods