Trying to clean up the commits for merge