Remove long dead workaround

Change-Id: I0a388b0a4bd2dd651e4c65d96aec648115189224
Clean up use of OSL debug functionality

Change-Id: I1efcdb7359ac43ee50d2f526bc29a10b1bef35b4
Clean up string concatenation

Change-Id: I83515f8907b000eb0506410e9b04f28f4257a3b8