Remove commented out blocks
Remove commented out blocks