Cleanup of last commit