Merge pull request #546 from bhariharan/unstable

Removing unused field
Fix for logout not working in one.app