Feature #100 - added cascade delete; added untrack before hooks