deleted commented out blocks