RFP Frontend

Can we remove the code that's commented out?