CS
Preparing simplified token system
Adjusted docs to new usage
Removed notification type interface usage
Fixed bug deleting messages
Finished notification type modification