Should get rid of the commented code.