Faster delete

Possible fix for Issue #4