Fix typos, remove unneeded imports