Finish delete_singletons, remove debug prints