Quick clean up needs to be in global version, what you think of this?