Remove Rectangle support