Notes added.
Unused code removed