Add missing files and remove uneeded common governor code.