Remove debug code, add handler for delete entries, etc.