Fix last commit cleanup