Management Code Clean Up

Management Code Clean Up