removed strange stuff from Github merge