Deleted unnecessary fields and options