core-5087 add remove template handler