Extra imports removed from Comment.m