Better delete and removes cruft