remove some print stmts, etc.