cleanup in cabnavigator.php, uncommented and not any more required statements removed