remove incorrect comments and speculative code