Removes some XXX for #14