removed some logging stmts