Got rid of things added in branch merge