a little cleanup of commented out code, better usage across versions