File Cleanup
Marc editor work