update to fix removal and forward statusCode error