MBH: file clean up and adding remote files