Use finalizers to avoid losing delete events and to ensure full resource cleanup

Use finalizers to avoid losing delete events and to ensure full resource cleanup #2029