Add delete, some cleanup