Cleaning warning an deprecated generated models