[-] Remove old shapes.
[~] Fix typo.