remove unused vars for now