removed unneccessary last-minute additions.