fixed use statements and unused functions