partial-expansion filename formating and remove some old commented code