BUGFIX: Removing old "comtrol" statements in templates.