deleted a bunch of commented out code we won't need