clean up and suppres some notices