More java doc and remove classes no longer needed.