Fix for removeExtras error