Code clean-up. No changes.
Removed unnecessary path.
Code clean-up. No changes.
Code simplification and refactoring.