Move fee policy out of core