javadoc and generic warnings removed