Clean up the mess of the last commit