Merge "Remove kingbird installation"