Chore/prep for deployment