removed legacy comment stuff from main model