clean up unused vars