clean up to produce less warnings