Remove bug code