Nigeria to end fuel subsidy by June