Temp removing buggy code