Tiny clean up of comments and unused aliases