removed disabled code