removed disabled code parts