Fix checkstyle and remove useless class