java doc added, removed unused code