removed some comments and left over debugging