Initial code to remove old feature branches
Merge branch 'multiple_deployments'