Package protected a bunch of code, removed dead code.
Removed before and after hooks for junit tests.