Remove hardcoding of cirros