Comment and Revision models replaced with Mark model
Clean-up from Comment/Revision/Mark model reorganization