Cleanup, progress on update and delete