Cleaned up imports, this was what CodeNarc was complaining about.