Some code cleanup
Added JSR305 to dependencies
Table checking moved to Node
Cleanup