Removed extrenous shapes