removed the FileName.unsafe methods
simplified the creation methods for references
removed some unsafe calls