further expr cleanup