NTFY-88 Removed old  code, new comments

Removed old code, and tidied up comments