20141029 Update part 2

Files that should have been deleted in previous update