Cleaned up OAuth and App stuff