Removed debugging code using Shape / Rectangle classes