Added extra logging and small tidy-up.
Remove un-used list.