Remove unnecessary imports that caused build to fail