Got removal of shapes working.