Cleaning up some directory references.