Clean up setting defintions