Cleanup following last commit