This PR does clean some things up. I see some commented out sections though, is this intentional?