Cleanup comments and links