Cleanup after fixing file problem

Still debugging other problems