remove unnecessary fields
fix response structure