Persistence check on deletion
Refactoring and log removals