deleted some commented function