FEPS improvements; removed unused template