ExpressionProvider is not needed anymore

Change-Id: I624a1235935396f4016c339e1d1b920e65d48393