Removed user references for directory and deployed files, Metadata fixes