added cascade for remove-related event handling
added handleRemove - completely untested