- deleted some commented code