some commenting out of code