Some cleanup plus stuff to enable doing reminders from aws