Hopefully last of the clean up