Fix checkstyle, remove unused file