Remove the bug number you are going to resolve. (Otherwise the code base would end up with bug XXXXXX in every line.)