Update Name and Cleanup Un-used Configs