removed wrong and unused code