Cleanup of Settings class