[Commits] 09018ffe0: Code cleanup