Remove host module for PR
Move check mode flag outside of arg spec