Fix deletion, should be optional