Minor cleanup unused imports and type fixes