Cleaning these up for the next release