Remove some indirection from files