Unnecessary imports removed