Remove disabled code