Remove references to load()