Fix bug cause by merge :|

- Forgot use simplified vc :(
- Adjust for correct time watching
- Change from simplifyLets into expandLets