Removed contrib.comments in favour of custom comments