got rid of unused vars/imports