Remove old way