Fix #14 : Added deletion triggers for properties and carried out
refactoring noted in issue.