lrlebrao Remove unneeded files (.orig left due merges)