removed unused class and some useless JavaDoc