Nicer logging and more deleting