Cleaned up configurations