Finished comment removal from #741