Remove remnants of buggy code