Remove helper code