Cleanups and work towards deletes