DDF-569: Cleaned up unused imports