removed decommented code