More dead code removal.
Optimized Imports.

And variable rename
Make analyze spec suites a separate job