some hard-coded instances of 'main' were remaining