removed dead code
Bugfixing