Remove old code kept for interest