Clouds commented out for now to improve performance, see #41