Fixes some checkstyle and find bugs errors.

Comments out more code to do this and uncomments copyrights.