Removed disabled code