Adds javadocs. Fixes warnings. Remove superfluous classes.