removed unreferenced code and unclarifying javadoc