Hopefully the last of the clean up