Re-Added Deletion code (cleaner this time) (Issue #91)