Remove unnecessary file and indirection