LabeledShape. Removed obsolete methods
Controller. Began revising