FileService work
- Also cleaned up some dispose calls