Clean up of last commit