clean up of ordering of optional files