No bug: Code cleanup. r=me