Remove heap support