Clean up the Require Import lists

Clean up the Require Import lists #18