Remove extra imports