Should the commerce and the necessary and proper clauses be removed from Article I, Section 8 of the Constitution?

Should the commerce and the necessary and proper clauses be removed from Article I, Section 8 of the Constitution?
The US Supreme Court uses these two clauses to invalidate the Ninth and Tenth Amendments. For example, The Supreme ruled the government could limit how much wheat a farmer can plant on his land. But he just fed it to his chickens. He didn't sell any of it across state lines. He didn't sell it at all. It never left his farm.
https://www.npr.org/sections/money/2012/07/05/156232075/the-farmer-and-the-commerce-clause
Should the commerce and the necessary and proper clauses be removed from Article I, Section 8 of the Constitution?
Post Opinion