Delete Model annotations and simplify coding.