Removed extrenous shapes
Merge pull request #553 from Foggalong/master

Removed extrenous shapes