Cleanup of lib/local and corresponding dependencies
Fixed a number of checkstyle warnings