Resolve "Remove unused fields from definition and models" Closes #21 See merge request inject/backend!58