Removed a dependency from shapes