Removed lots of debug() calls