commented out some harmful code