Remove Shape and Controller classes.