Finished removing AffineTransform