Clean up and return status and body instead of forcing OK