some cleanups!
turn of debugging