More cleanup, debugging is now DISABLED by default