Allow deletion of listeners
Fix delete System by type