removed newly dead code
checkstyle fixes