CS 355 - Remove deprecated shapes