unused vars clean up