Cleaned up server and index properties.