Remove old figure code