You might want to look into the CJM billet top hat for the fuel pump assembly while you are there. I would highly suggest doing it now when you are taking everything out, since that is what you have to do to install the top hat.
CJM Fuel Pump Hat | CJ Motorsports