Cleaned up configuration storage. Configuration is now persistent.