Removed disabled code with comments altogether