Eliminate the warnings and unused imports
ADD MR