Remove left overs from builtin module names