Further clean up of the last commit