cleaned up delete and save