More cleanup.
context path fix.