Initial transformation to remove External Bus (code compiles)