Cleaned up configs, started streamlining