Removed Square class