Cleaned up config again