File cleanup
Merge fix