- #7 remove some commentted code