Add type parameters to output metrics
Fix Javadoc build, delete unused class