Removing comments as part of #106