Fix bug - had commented out good code to test something - commented back in
remove NS Logs and some commented out code