removed old and unused stuff