fixes import and unused warnings