Remove distracting comments and code. Thanks to Nils for picking up on the outstanding ticket. PR: 926