GitHub #123: Further cleanups on delete