cleanup and ID add

1. Add file ID on the saved file window
2. Cleanup of unused code