Remove the old and unused