Checkstyle: various Categories + remove unused code

Change-Id: Ie8d634b683e4c1959f967d068d9774b7ee1cc0f1