cleanup squares and circles