Getting rid of some of my commented out code.