Cleaning up and adding deletion property template