Remove macrosFile dependency