Temporary removal of buggy code