Cleaning up. Delete() still needs more testing.