checkstyle and dependency cleanup