remove Shape
minor clean up