Cleaned up config items