Refactored removement of shapes/sprites