Cleanup as the 'comments' attribute is not required anymore