shawn - path cleanup.
