- remove remaining dirFlags - clean method names Change-Id: I404b643cd10321e977530528168d1d415b3f2eca