added builder annotation and remove unwanted model class

[dakbhavesh]

Hi @sboeckelmann, Can you please review the minor changes in this PR and merge them?