[bug 1045982] Code cleanup