Remove hard-coding of file units