Extent -> Rectangle, remove unused code.