Restore bundle path parameters and remove unused yaml call