clean up some and remove some notices