Changes made to removeXID and commit