Cleanup and removed orphaned or redundant vars.