No. The Government needs an overhaul to bring it back inline with the express limits in the Constitution. The USC needs to be mostly gutted as a large portion of the crap that has been added to it is blatantly outside the scope of the US Con.
Looking right at you USC Title 18 Chapt 44...
YOU ARE CORRECT.