removed canopy stuff