Various updates on braintree, simplify and paymill