Routing Table : further code removal