remove deprecated and unused code