Warning clean up