remove old and unused code