Added postal. Clean up Non AMD module injection.