Removing config changes from cloudformation branch