doc
some refactorig
removed old parts