Drop some unnecessary fields

Dropped some fields from schema and handlers.