First Stage of cleanup after moving to Attrio as backend