Removing cruft from OAuth branch