Remove stoppoint references