Fix broken import and remove dead code