Remove unactual code, add diff for the bug.