cleaning unused vars