I have removed the dependency from shapes.