updated JavaDoc and cleaned imports
removed unused Lars Vogel Code
cleaned JavaDoc