removed some junk that was part of the merge