import cleanup, elastic tabular report class heirarchy updates