fix bugs.
Delete Model annotations and simplify coding.