Implemented OAuth data encrypt

+ some cleanup of unused code