Cleanup and add config command