removed obsolete comments, variables - minor cleanup