Removing system template code