remove old classes
Comment.FieldUI trait moved and renamed
misc code review