More polished delete/create