clean up warnings from unused vars