Remove Extras Tab and clean up