code cleanups

removed old commented code
improved logging texts
removed unnessecary logs