cleanup unused vars