Module cleanup#377

VamatoHD wants to merge 2 commits into

kaifcodec:mainkaifcodec/user-scanner:mainfrom

VamatoHD:cleanupVamatoHD/user-scanner:cleanupCopy head branch name to clipboard