Remove references to static::