Remove unwanted lib
Var renaming
Name refactoring
Refactoring
Removed useless checks
APs in VOs
calculation script alter