move comments out of simulate namespace