Comment out additional helpers and add them to a TODO list