cleaned up some commentet-out code I missed