Remove Filename abstraction