Remove artifact storage, add some debug