Remove old AWAY code