Changed place where bakery.yaml is located, removed unused code, fixed error