removing unused required=false properties, removed misused required=true properties and replaced with @NotNull