Cleans up some XXX’s