Vinay | #2170 | Remove local name parameters. This causes performance issues in JSS