Remove buggy code