Remove unused vars/params