Deleted obsolete class.
Refactor Calculate Class.