Added removal of squares