MIFOSX-365: Simplify 'Data Tables' functionality
remove unused import warnings and unused variable warnings.