clean up warnings
More cleanup