Most recent refactoring - delete still not working