Cleaned up configs