Remove references to built-in modules

@nightwing sorry for the lag on this one!