Remove commented out code from the theme.
Fix some copypasta.