Market template clean-up