- Added nonce field and check for added security
- Removed unused comments
- Removed unused class