Moved non-essential imports from util to edge