Use config, clenaup