Update umbrella agreement ddl and clean up agreement code.