Remove old and unused code