Clean up some comments and a mistake from rebasing