Cisco systems support removed + small refactoring