Cleanup for previous commit