Remove properties and add template