Minor changes- removed unnecessary imports