Removing unused shape classes and fix examples
These will be re-added for a later version