MtpA - Refactor some import packages to remove un-needed ones