L15 cleanup.
incorporate L15
L16 stub.