removed some old and unused code