some cleaning for Navigation classes (Ebr)