Remove variable support