We should go back to what we had before then just make sure all necessary computer databases actually talk to each other. That would have stopped 9/11 probably, and we would save a bunch of money.
Also, the NSA should be significantly cut back too. Enough to ensure they don't have enough money to monitor anything that doesn't initiate from out of country.
Then, give all those savings to NASA. Or half anyway.