Remove references to built-in modules
Merge pull request #2253 from wcandillon/patch-1

Remove references to built-in modules