tweaks for data lifecycle/archiving but we are commenting it out for now