Remove Extras
Put back extras