Tech Debt: Cleaned up some unnecessary comments